From 2efa9c7b3605be830efa3f755a690dda285b72ca Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Thu, 17 Jul 2025 22:03:52 -0600 Subject: [PATCH] Revert "strongswan: fix build issues around PARSE_ERROR" @tobiasbrunner is asserting that this patch is no longer necessary with 6.x. This reverts commit 89fa8033b851db004182c5e33b0728bc2f95b807. --- net/strongswan/Makefile | 2 +- .../patches/0100-work-around-parse_error-clash.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 net/strongswan/patches/0100-work-around-parse_error-clash.patch diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 1687a387e8..40962f96d7 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=6.0.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ diff --git a/net/strongswan/patches/0100-work-around-parse_error-clash.patch b/net/strongswan/patches/0100-work-around-parse_error-clash.patch deleted file mode 100644 index 902ef16bdc..0000000000 --- a/net/strongswan/patches/0100-work-around-parse_error-clash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c -+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c -@@ -27,6 +27,8 @@ - #include - #include - -+#define PARSE_ERROR WOLFSSL_PARSE_ERROR -+ - #include "wolfssl_plugin.h" - #include "wolfssl_aead.h" - #include "wolfssl_crypter.h" -- 2.30.2